Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sort categories list by translation in the categories and groups pages #8632

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Sort categories list by translation in the categories and groups pages #8632

merged 1 commit into from
Jan 31, 2025

Conversation

josegar74
Copy link
Member

Before:

before-1

After:

after-1

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

@josegar74 josegar74 added this to the 4.4.7 milestone Jan 30, 2025
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@davidblasby
Copy link
Contributor

looks good 👍

@josegar74 josegar74 merged commit a44e7eb into geonetwork:main Jan 31, 2025
7 of 8 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr 
error: could not apply 25ec5ebc80... Sort categories list by translation in the categories and groups pages
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
stdout 
Auto-merging web-ui/src/main/resources/catalog/js/admin/CategoriesController.js
Auto-merging web-ui/src/main/resources/catalog/js/admin/UserGroupController.js
CONFLICT (content): Merge conflict in web-ui/src/main/resources/catalog/js/admin/UserGroupController.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8632-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 25ec5ebc80572ca2ff5b131dbba564e29573c0e5
# Push it to GitHub
git push --set-upstream origin backport-8632-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8632-to-4.2.x.

@josegar74 josegar74 mentioned this pull request Jan 31, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidblasby davidblasby davidblasby approved these changes

@fxprunayre fxprunayre Awaiting requested review from fxprunayre

Assignees
No one assigned
Labels
backport 4.2.x failed backport
Projects
None yet
Milestone
4.4.7
Development

Successfully merging this pull request may close these issues.
4 participants
@josegar74 @CLAassistant @davidblasby @geonetworkbuild